Improvements to the circle build