Some property fixes.