Fixed some routing issues