Fixed a few functions that weren't set to static. We apparently need more tests.