Fix version resolving and bump version