Build fixes and circle trace WIP