VideoPlayer tweaks and fixes