Fixed version issues