Update according to fixes