Additional work on build tools