Fixes and improve generators