More compat fixes, prepare to validate content-md5