Change the order of ssh related fixes.