Generator : Fixed some Warnings for Clang
Generator : Re-fixed nasty bugs

Shame on me for not taking enough care while merging my own branch
Generator : Fixed typo