Fix editable fields