Some quick fixes

Hi!
I found your generator really awesome
After using it for 2 small projects decided to pass you some fixes.