more minor fixes for qt5 transition