Changes to work on last git version