Another regex fix and an export tweak