Couple of changes to allow Linux and Mac to compile with Qt5