more fixes from bad routing