routing related fixes