Fixed bug in validations breaking creation/update