fixes for object manager