Some fixups blocking Qt 5