Clearing some deprecation errors