Fix export functionalities