Final fixes for the fields bug I introduced.