Property fixes