Fix route bugs