Hot fixes to develop with Qt5