Deprecation warnings begone...