Mark a few more functions as static