Bug Fixes on Persistance Objects