Improve handling of initial 'base' send