Make some internal functions static