diff --git a/Base.mk b/Base.mk
index 1c94e57..d26e57a 100644
--- a/Base.mk
+++ b/Base.mk
@@ -377,17 +377,9 @@ endif
 
   ifeq ($(ESMF_COMM),mpt)
     MPICC := mpicc
-    ifeq ($(findstring ifort,$(notdir $(FC))),ifort)
-      CC := gcc
-      CC_FROM_ENV := FALSE
-    endif
   endif
   ifeq ($(ESMF_COMM),mpt)
     MPICXX := mpicxx
-    ifeq ($(findstring ifort,$(notdir $(FC))),ifort)
-      CXX := g++
-      CXX_FROM_ENV := FALSE
-    endif
   endif
 
 # Make sure we have compilers
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9559b6b..fb5d351 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 ### Updates
 ### Fixed
+
+- Fixes for MPT and using icx/icpx at NAS
+
 ### Changed
 ### Removed
 ### Added