changes to build with bjam