More work getting build tools 17 working