Some qml fixes to new model