Make some PSQ functions conform to the interface