Upgrade-related variations are now possible, and fixed an issue related to self-targeting spells