FIX RELEASE 0.99.20 upgrade bugs