Fix bugs in generator bundle
Fix typo in template