Fixes for listening socket