Few export adjustments