Changes to correct routing issues