Use correct constants for number keys