Fixes for Qt5