Updated to build with latest build tools