Fix references to constants that were deleted yesterday