Changes to keep up with changes in Qt