Fixed some default routing issues