Fixes for legacy upgrader in 2.0 stable