Fixed a couple of small issues with properties.