Fixed a couple issues raised with multiple deps.