Modifying validations so that the server works for the current POC