export features fixes