fixes for the upgrade