More fixes for editable fields