Fix up exports