fixing more validation errors