Video pipeline PR fixes