Fix some dependencies with wrong version

Change-Id: I62090869603be0bfb21544e96eff6ae2d398c3e6