Minor fixes with dont_track_in_avg option