Attempt fixing imports