Fixes for RegenerationUpgrade