20747: Some QT fixes

Top