Minor response and router tweaks