All obj_types fixed now.