Corrected additional object manager issues pointed by Philip Susi