Modeler fixes