diff --git a/runtime/runtime.mk b/runtime/runtime.mk
index 31e4b44348..29fee17ff5 100644
--- a/runtime/runtime.mk
+++ b/runtime/runtime.mk
@@ -632,12 +632,6 @@ GEN_GPU_OBJS	:=
 GPU_RUNTIME_OBJS:=
 endif
 
-ifeq ($(strip $(FORTRAN_LEAF_TASK)),1)
-GEN_FORTRAN_OBJS	:= $(GEN_FORTRAN_SRC:.f90=.o)
-LD_FLAGS	+= -lgfortran
-F90	:= gfortran
-endif
-
 ifeq ($(strip $(LEGION_WITH_FORTRAN)),1)
 GEN_FORTRAN_OBJS	:= $(GEN_FORTRAN_SRC:.f90=.o)
 LD_FLAGS	+= -lgfortran
@@ -657,11 +651,7 @@ all: $(OUTFILE)
 endif
 
 # If we're using CUDA we have to link with nvcc
-ifeq ($(strip $(FORTRAN_LEAF_TASK)),1)
-$(OUTFILE) : $(SLIB_LEGION) $(SLIB_REALM) $(GEN_OBJS) $(GEN_FORTRAN_OBJS) $(GEN_GPU_OBJS)
-	@echo "---> Linking objects into one binary: $(OUTFILE)"
-	$(CXX) -o $(OUTFILE) $(GEN_OBJS) $(GEN_FORTRAN_OBJS) $(GEN_GPU_OBJS) $(LD_FLAGS) $(LEGION_LIBS) $(LEGION_LD_FLAGS) $(GASNET_FLAGS)
-else ifeq ($(strip $(LEGION_WITH_C)),1)
+ifeq ($(strip $(LEGION_WITH_C)),1)
 $(OUTFILE) : $(GEN_OBJS) $(GEN_C_OBJS) $(GEN_GPU_OBJS) $(SLIB_LEGION) $(SLIB_REALM)
 	@echo "---> Linking objects into one binary: $(OUTFILE)"
 	$(CXX) -o $(OUTFILE) $(GEN_OBJS) $(GEN_C_OBJS) $(GEN_GPU_OBJS) $(LD_FLAGS) $(LEGION_LIBS) $(LEGION_LD_FLAGS) $(GASNET_FLAGS)
@@ -705,12 +695,7 @@ $(GPU_RUNTIME_OBJS): %.cu.o : %.cu
 	$(NVCC) -o $@ -c $< $(NVCC_FLAGS) $(INC_FLAGS)
 	
 $(LEGION_FORTRAN_API_OBJS) : %.o : %.f90
-	gfortran -cpp -J$(LG_RT_DIR) -o $@ -c $< $(FC_FLAGS) $(INC_FLAGS)
-
-ifeq ($(strip $(FORTRAN_LEAF_TASK)),1)	
-$(GEN_FORTRAN_OBJS) : %.o : %.f90
-	$(F90) -cpp -o $@ -c $< $(CC_FLAGS) $(INC_FLAGS)
-endif
+	$(F90) -cpp -J$(LG_RT_DIR) -o $@ -c $< $(FC_FLAGS) $(INC_FLAGS)
 
 ifeq ($(strip $(LEGION_WITH_FORTRAN)),1)	
 $(GEN_FORTRAN_OBJS) : %.o : %.f90
diff --git a/tutorial-fortran/c_with_fortran/00_hello_world/Makefile b/tutorial-fortran/c_with_fortran/00_hello_world/Makefile
index 118e23c526..0284f04770 100644
--- a/tutorial-fortran/c_with_fortran/00_hello_world/Makefile
+++ b/tutorial-fortran/c_with_fortran/00_hello_world/Makefile
@@ -41,7 +41,7 @@ CC_FLAGS	?=
 NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
-FORTRAN_LEAF_TASK	?= 1
+LEGION_WITH_FORTRAN	?= 1
 
 ###########################################################################
 #
diff --git a/tutorial-fortran/c_with_fortran/06_privileges/Makefile b/tutorial-fortran/c_with_fortran/06_privileges/Makefile
index e1a78692a2..a05c1aad57 100644
--- a/tutorial-fortran/c_with_fortran/06_privileges/Makefile
+++ b/tutorial-fortran/c_with_fortran/06_privileges/Makefile
@@ -41,9 +41,8 @@ CC_FLAGS	?=
 NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
-FORTRAN_LEAF_TASK	?= 1
+LEGION_WITH_FORTRAN	?= 1
 
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/c_with_fortran/07_partitioning_fortran_task/Makefile b/tutorial-fortran/c_with_fortran/07_partitioning_fortran_task/Makefile
index 6de04658ba..a0c6b648ba 100644
--- a/tutorial-fortran/c_with_fortran/07_partitioning_fortran_task/Makefile
+++ b/tutorial-fortran/c_with_fortran/07_partitioning_fortran_task/Makefile
@@ -41,9 +41,7 @@ CC_FLAGS	?=
 NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
-FORTRAN_LEAF_TASK	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
+LEGION_WITH_FORTRAN	?= 1
 
 ###########################################################################
 #
diff --git a/tutorial-fortran/c_with_fortran/07_partitioning_raw_ptr/Makefile b/tutorial-fortran/c_with_fortran/07_partitioning_raw_ptr/Makefile
index 1695ad883a..42c79072f3 100644
--- a/tutorial-fortran/c_with_fortran/07_partitioning_raw_ptr/Makefile
+++ b/tutorial-fortran/c_with_fortran/07_partitioning_raw_ptr/Makefile
@@ -41,9 +41,7 @@ CC_FLAGS	?=
 NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
-FORTRAN_LEAF_TASK	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
+LEGION_WITH_FORTRAN	?= 1
 
 ###########################################################################
 #
diff --git a/tutorial-fortran/fortran/00_hello_world/Makefile b/tutorial-fortran/fortran/00_hello_world/Makefile
index 69a83b05cd..d9b79c053e 100644
--- a/tutorial-fortran/fortran/00_hello_world/Makefile
+++ b/tutorial-fortran/fortran/00_hello_world/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= hello_world
 # List all the application source files here
-GEN_FORTRAN_SRC	?= hello_world.f90		# .c files
+GEN_FORTRAN_SRC	?= hello_world.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/02_index_tasks/Makefile b/tutorial-fortran/fortran/02_index_tasks/Makefile
index f038dd556f..38e802fcd7 100644
--- a/tutorial-fortran/fortran/02_index_tasks/Makefile
+++ b/tutorial-fortran/fortran/02_index_tasks/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= index_tasks
 # List all the application source files here
-GEN_FORTRAN_SRC	?= index_tasks.f90		# .c files
+GEN_FORTRAN_SRC	?= index_tasks.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/06_privileges_2d_accessor/Makefile b/tutorial-fortran/fortran/06_privileges_2d_accessor/Makefile
index 02ab5bcd92..11a7797fe7 100644
--- a/tutorial-fortran/fortran/06_privileges_2d_accessor/Makefile
+++ b/tutorial-fortran/fortran/06_privileges_2d_accessor/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= privileges
 # List all the application source files here
-GEN_FORTRAN_SRC	?= privileges.f90		# .c files
+GEN_FORTRAN_SRC	?= privileges.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/06_privileges_accessor/Makefile b/tutorial-fortran/fortran/06_privileges_accessor/Makefile
index 02ab5bcd92..11a7797fe7 100644
--- a/tutorial-fortran/fortran/06_privileges_accessor/Makefile
+++ b/tutorial-fortran/fortran/06_privileges_accessor/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= privileges
 # List all the application source files here
-GEN_FORTRAN_SRC	?= privileges.f90		# .c files
+GEN_FORTRAN_SRC	?= privileges.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/06_privileges_raw_rect_ptr/Makefile b/tutorial-fortran/fortran/06_privileges_raw_rect_ptr/Makefile
index 1f1b8bb93a..8d25612bb2 100644
--- a/tutorial-fortran/fortran/06_privileges_raw_rect_ptr/Makefile
+++ b/tutorial-fortran/fortran/06_privileges_raw_rect_ptr/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= privileges
 # List all the application source files here
-GEN_FORTRAN_SRC	?= privileges.f90		# .c files
+GEN_FORTRAN_SRC	?= privileges.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/07_partitioning/Makefile b/tutorial-fortran/fortran/07_partitioning/Makefile
index 1d7bb8c9b6..22af626fd9 100644
--- a/tutorial-fortran/fortran/07_partitioning/Makefile
+++ b/tutorial-fortran/fortran/07_partitioning/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= partitioning
 # List all the application source files here
-GEN_FORTRAN_SRC	?= partitioning.f90		# .c files
+GEN_FORTRAN_SRC	?= partitioning.f90		# .f90 files
 GEN_GPU_SRC	?=				# .cu files
 
 # You can modify these variables, some will be appended to by the runtime makefile
@@ -39,8 +39,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here
diff --git a/tutorial-fortran/fortran/attach_file/Makefile b/tutorial-fortran/fortran/attach_file/Makefile
index b373d392eb..9ccb48d4cd 100644
--- a/tutorial-fortran/fortran/attach_file/Makefile
+++ b/tutorial-fortran/fortran/attach_file/Makefile
@@ -29,7 +29,7 @@ ALT_MAPPERS     ?= 0		# Include alternative mappers (not recommended)
 # Put the binary file name here
 OUTFILE		?= attach_file
 # List all the application source files here
-GEN_FORTRAN_SRC	?= attach_file.f90		# .c files
+GEN_FORTRAN_SRC	?= attach_file.f90		# .f90 files
 GEN_SRC ?= generate_hdf_file.cc
 GEN_GPU_SRC	?=				# .cu files
 
@@ -40,8 +40,6 @@ NVCC_FLAGS	?=
 GASNET_FLAGS	?=
 LD_FLAGS	?=
 LEGION_WITH_FORTRAN	?= 1
-# For Point and Rect typedefs
-CC_FLAGS	+= -std=c++11
 ###########################################################################
 #
 #   Don't change anything below here