Small routing bugfixes