Fixes for bidirectional field saving when two bidirectional fields exist on the same pod