Update cookbooks and some tweaks