Fix circular dependencies (thks to Latios)