Fixes for router url changes