Fix some dependencies flagged in scans