diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58b87c798..eca6cbc06 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -111,8 +111,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Update submodules
-        run: git submodule update --init --checkout
+      # Using CMake FetchContent to pull FreeRTOS-Kernel now.
+      # - name: Update submodules
+      #   run: git submodule update --init --checkout
+      - name: Build Install Dependencies
+        run: |
+          sudo apt-get install -y libpcap-dev
       - name: Build checks (Enable all functionalities)
         run: |
           cmake -S . -B build/ -DFREERTOS_PLUS_TCP_TEST_CONFIGURATION=ENABLE_ALL
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 96939e21c..51c3bbd65 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -63,39 +63,21 @@ target_include_directories( freertos_plus_tcp SYSTEM
 #TODO(phelter): Investigate and fix in freertos_plus_tcp if not already fixed.
 target_compile_options( freertos_plus_tcp
   PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-address-of-packed-member>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-bad-function-cast>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-declaration-after-statement>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-documentation>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-cast-qual>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-conditional-uninitialized>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-covered-switch-default>
+    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-documentation>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-extra-semi-stmt>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-format-nonliteral>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-format>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-gnu-statement-expression>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-implicit-int-conversion>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-int-to-pointer-cast>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-macro-redefined>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-missing-noreturn>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-missing-prototypes>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-missing-variable-declarations>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-packed>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-padded>
     $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-pedantic> # ENABLE_ALL config only
-    $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-pointer-to-int-cast>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-reserved-identifier>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-reserved-macro-identifier>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-shorten-64-to-32>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-sign-conversion>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-tautological-constant-out-of-range-compare>
-    $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-type-limits>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-undef>
-    $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-uninitialized>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-unused-but-set-variable>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-unused-function>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-unused-macros>
-    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-unused-parameter>
+    $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-unused-but-set-variable>
+    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-unused-macros>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-unused-variable>
 )
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f5e346218..e147fe85d 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -21,7 +21,6 @@ target_include_directories( freertos_plus_tcp_tools SYSTEM
 #TODO(phelter): Investigate and fix in freertos_plus_tcp if not already fixed.
 target_compile_options( freertos_plus_tcp_tools
   PRIVATE
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-extra-semi-stmt>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wno-format>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-missing-variable-declarations>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-padded>