Fixes a few bugs introduced after FFmpeg checks