Fixes to import / save process for field definitions