Video plan fixes from Neil