Fix export of package private functions