Cleanup, qt4 fixes