Fixed few deprecations.