Tidy up and suppress deprecation warnings