Some changes to how multipart updates are handled [WIP]