Video Setup fixes