Remove some warnings, fix some deprecation warnings.