Continued work on porting to QML Air