Fix export/mount declarations