Fix up some vars that were missed in the merge