qbs fixes and early feature api draft