Analytics + airport fixes