Fixes for a bunch of problems. It seems cookbooks community maintenance is unreliable