more consistency fixes for router refactor