Fix routing issues