Merge "Fix references to two constants"