some more fixes for this upgrade here