Fix some regressions: note this is still only a partial fix, changes to the Boost.Config tests are also needed.