Minor routing improvements