Fixed some problems with routes