fixes for bwalker8038/generator-bakery #6