a few psalm fixes