Fixing up missing fields and content