Mark more functions as static to prevent warnings