try to fix some recursive imports