Fix nested imports