diff --git a/srt.code-workspace b/srt.code-workspace
new file mode 100644
index 0000000000..f3ed6ea9b6
--- /dev/null
+++ b/srt.code-workspace
@@ -0,0 +1,19 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {
+		"files.associations": {
+			"*.c": "c",
+			"*.cpp": "cpp",
+			"functional": "cpp",
+			"atomic": "cpp",
+			"*.tcc": "cpp",
+			"fstream": "cpp",
+			"sstream": "cpp",
+			"regex": "cpp"
+		}
+	}
+}
diff --git a/srtcore/socketconfig.h b/srtcore/socketconfig.h
index 488d12fb10..1cf85fdf3c 100644
--- a/srtcore/socketconfig.h
+++ b/srtcore/socketconfig.h
@@ -180,7 +180,7 @@ struct CSrtConfig: CSrtMuxerConfig
     static const int
         DEF_MSS = 1500,
         DEF_FLIGHT_SIZE = 25600,
-        DEF_BUFFER_SIZE = 8192, //Rcv buffer MUST NOT be bigger than Flight Flag size
+        DEF_BUFFER_SIZE = 16384, //Rcv buffer MUST NOT be bigger than Flight Flag size
         DEF_LINGER_S = 3*60,    // 3 minutes
         DEF_CONNTIMEO_S = 3;    // 3 seconds
 
@@ -267,7 +267,7 @@ struct CSrtConfig: CSrtMuxerConfig
 
     CSrtConfig()
         : iMSS(DEF_MSS)
-        , zExpPayloadSize(SRT_LIVE_DEF_PLSIZE)
+        , zExpPayloadSize(SRT_LIVE_MAX_PLSIZE)
         , bSynSending(true)
         , bSynRecving(true)
         , iFlightFlagSize(DEF_FLIGHT_SIZE)