Fix various __virtual__ not renamed DeprecationWarnings\n\n@thatch45, this is all that was needed, correct?