Video Queue Fixes