Add static keyword to the rest of the global variables