Commit fixes for router defaults.