Fix video rec + improve