Mark more functions as static