Avoid some more deprecated properties