Merge "correct the so-libs global"