Bugfixes for changes in routes