Fix issues found in xvmc repo pull