fix final validation errors