More fixes to export targets