Misc fixes

Misc fixes Ping @balanced-cookbooks/chefs