Fix codegenerator bugs (keyword issues)