Fixing RC1 Upgrade