Properly scope some imports