Minor fixups after comparing to good file