Fix versions properly