More fixes to circle file.