Fixed routing issues