Two deprecations fixed