Changes necessary to build with Qt5