Fix 2014.10 deprecations