Merge fixes. /s/QtGui.//; Refactor fixes.