KZ1000 O-ring questions

2 quick questions on O-rings for my 1981 KZ1000 Ltd.
I bought a comprehensive gasket kit which comes with a bag of O-rings but I am not sure:

A: Drain plug. The one on the bike was thoroughly crushed. I found one in the kit which looks almost good, maybe a bit loose. Am I missing something ?
B. Oil filter Mounting Bolt: not sure which O-ring is meant to replace the one at the base of the bolt. See photo below which includes a valve seal for size reference. Any idea on which one to pick here ?