Fixed issues in VideoController