CSVTCPServer and HTTPServer fixes