Unexported a few functions