fixed some circle dependencies