Optical flow improvements