Fixing old definitions.