Wizard with routing fixes.