A few fixes to make the CookBook build successfully.
This will create a new commit in order to revert the existing changes.
