more property fixes