More fixes in psievents