fixing up build tools primarily