fixing some glitches with external dependencies

Change-Id: I1795303ef28950579fa293a9240d3b67ccbc853d