Various fixes to track send volumes