Yes, 22 caused me no end of problems, almost LOI. Saw the answer fairly quickly, but doubted it due to the (dubious IMO) plural "drugs" in the clue. The short 18 was also difficult, with a cunningly disguised definition and a plausible (but non-parsing) "red herring" solution that works with the crossers.