Fixed a few bugs with average queue times