Fix optroute and optvector