Connect multipart handling

Fixes upcoming connect 3 inconsistencies.