Fix possible import problems between plugins