- Fixed problems with the code generation