Fixed/tweaked more deps.