0.22.10 (Nivve) AND validator fixes