Some deprecations fixed.