extra/qt5 fixes (#443)