Compile fixes for new qbs