object management fixes