FIX Deprecation fixes

Fixing deprecation issues between 2.4 and 3.0