Fixed version mismatch problems