Fix circular dependency. Fix draw calculation for corp.