Small tweaks to make routing a bit cleaner