Fixes to ObjectConstancy