Add static to some variables