Fixed links and adjusted routing