More fixes for the upgrade