Fix for videoserver locking