Fixes for PSI

Using a key is not supported by the module atm (or so it seems), but
the implementation is correct (or so it should be).