Some more depency tweaks.