Fixed all routing issues