Fixes for low message volume bug