Address some issues raised in https://github.com/gem/qt-experiments/pull/7