More fixes related to Export Style