Fixup some dependencies

Change-Id: I838733e00a1cd7e08adea5a5256409deaa691501