Upgrade to 2.7.2, fix some deprecation warnings