Updates to editing and validation fail bug