Fixed references to constants.