Fix Rob's OCD (and some analytics)