More improvements to relative routes