Fix a couple things that broke during merge of router.js