Some fixes for support of upstream qbs