Compile fixes for upstream qbs.