Some changes for PSK (#228)