Changes to stop deprecation notices