Fixed more validation errors.