Fixes some possible cyclic imports