Minor fixes on ModelObjectsWidget