Fix typos, remove cyclic dependency