Fixed a couple of other places where care needs to be taken in handling deprecated properties.