Fixes issues that came up in merge with connection and upd new video driver