GenNEXT syntax fixes