Fixed up some cyclic dependencies.. edge case in comp