Make two functions static