Missed some references to globals in the old file vs new file