Gatehouse routing tweaks.