fix some routing issues