Dependancies: Moar Derp fixes v2

Change-Id: I823843e7feee2da59a864df84331f7c255b7a2d2