Fixed some stupid routing issues

See above