Fixes to multipart