[Segment] Header changed and a few fixes that I noticed too late.
[Segment] Header changed and a few fixes that I noticed too late.

AlexanderBabchenko/ARAnalytics,orta/ARAnalytics,levigroker/ARAnalytics,sgtsquiggs/ARAnalytics,wzs/ARAnalytics