build tools fixes