Bug fixes to Fields and Content