Fixing constant intitializations