Update for wifi and jf-next.