Fixes for Object Saving