Fixing constant values from upstream.