Updates to build tools 0.11.+