Made some minor fixes to how content-type and context is handled on remote XML files.