Fixes for QT5