Fixed global namespace pollution + more adjustments needed for VNC from .8.6 branch

GMI's Touchbridge can't build without this commit