Fixes for multipart/related