Fix up variables.