Several fixes

Could you pick a less generic-sounding namespace here, preferably something with 'chef' in it...