Fix property checks