Fix acceptance and CI