Fixed issues with routes