Fix broken and circular imports