Update for newer PSReadline, other fixes