EntityInfoCodeGenerator fixes