Fixed more routes