fixes for route bugs