Patch/fix field options