Fixes in *FieldInstruction beans