Fixes to sockets and displays