Deprecation warning tweaks