Fix some video hang issues