static field fixes