Deal with import cycles