More fixes for deprecated stuff