Fix up variables