Updated to latest build tools