Some more bugfixes handling specific cases in the new topology move.