Address a couple deprecation warnings.