Fix some property enforcements.
Merge pull request #2479 from denis-sh/fix-some-property-enforcements

Fix some property enforcements.