Optical flow fixes