Fix version issues