Fixed static variable references