diff --git a/Tools/GNUMake/comps/intel-llvm.mak b/Tools/GNUMake/comps/intel-llvm.mak
index 11971dfc7f5..a09e18ffd1a 100644
--- a/Tools/GNUMake/comps/intel-llvm.mak
+++ b/Tools/GNUMake/comps/intel-llvm.mak
@@ -27,8 +27,8 @@ ifeq ($(DEBUG),TRUE)
 
   CXXFLAGS += -g -O$(DEBUG_OPT_LEVEL) -ftrapv
   CFLAGS   += -g -O$(DEBUG_OPT_LEVEL) -ftrapv
-  FFLAGS   += -g -O$(DEBUG_OPT_LEVEL) -ftrapuv -check bounds,pointers,uninit -traceback
-  F90FLAGS += -g -O$(DEBUG_OPT_LEVEL) -ftrapuv -check bounds,pointers,uninit -traceback
+  FFLAGS   += -g -O$(DEBUG_OPT_LEVEL) -ftrapuv -check bounds,pointers -traceback
+  F90FLAGS += -g -O$(DEBUG_OPT_LEVEL) -ftrapuv -check bounds,pointers -traceback
 
 else
 
@@ -98,6 +98,11 @@ CFLAGS   += $(GENERIC_COMP_FLAGS)
 FFLAGS   += $(GENERIC_COMP_FLAGS)
 F90FLAGS += $(GENERIC_COMP_FLAGS)
 
+ifneq ($(USE_F_INTERFACES),TRUE)
+  F90FLAGS += -nofor-main
+  FFLAGS   += -nofor-main
+endif
+
 ########################################################################
 
 ifneq ($(BL_NO_FORT),TRUE)