Fixes to batch sending