Fixup exported function s