Update to new build tools