Minor changes to scanner.c