Fixing cyclical reference issues.