Fixed a few bugs in routes