Fixes to get legacy 2.x sends working.