Fixed version mismatch issues