Minor fixes
Port to Qt5