More fixes to to_field