More routing issues fixed