First pass of Qt5.3 compatibility