Fix keys feature for socket/termjs etc