Fixing deprecation notices for 3.2+