Bug fixing

Fixed bugs with the generation of primitive types.