Fix property handling.