Fix Deprecation Warnings in upcoming 0.44 release