A few fixes to make the CookBook build successfully.
Merge details
mentioned in commit 5a1de2f1
merged
added bug label