Minor tweaks for exporting by convention