Fix some more deprecation warnings