Fix unexported functions