More build tools fixes