Additional QT 5 fixes