Fix some circuluar references
1.0a2