Solves several minor bugs in routes