Pulling in @cparnot's fixes for MABGTimer