Fixing more routes