Make a few internal funcs static