Fixes for objects and properties