Switched to build tools 18.1