Fixed upgrade to 4.0.0 process