Fixed references to static values