fix up some property handling