That's the one. I once watched it with my step brother, who is an air traffic controller. He was not impressed!
My pet nitpick is the Watchers' minions in Buffy. They were very much working-class Cockneys (or what passes for them on American TV), and complained that their bosses got to fly...