Fixing intderdependency issues.