Fixing up deprecated properties