Fixing object issues