More changes to get working in QML.