There are a few more fields that need to be set here for spec-compliance; see Matt's recent changes.