Bug fixes for object persistence
Bug fixes for object persistence