Tweaks on dependencies