Some final cookbook modifications after testing on a fresh checkout #47