Fix some property enforcements.