Fixes to property_id=0