Index: /issm/trunk-jpl/src/m/classes/autodiff.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 19966)
+++ /issm/trunk-jpl/src/m/classes/autodiff.py	(revision 19967)
@@ -6,4 +6,5 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from MatlabFuncs import *
 
 class autodiff(object):
@@ -67,5 +68,5 @@
 		md = checkfield(md,'fieldname','autodiff.tbufsize','>=',524288)
 		md = checkfield(md,'fieldname','autodiff.gcTriggerRatio','>=',2.0)
-		md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',2000000)
+		md = checkfield(md,'fieldname','autodiff.gcTriggerMaxSize','>=',65536)
 
 		#Driver value:
Index: /issm/trunk-jpl/src/m/classes/toolkits.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/toolkits.py	(revision 19966)
+++ /issm/trunk-jpl/src/m/classes/toolkits.py	(revision 19967)
@@ -6,4 +6,6 @@
 from EnumDefinitions import *
 from checkfield import checkfield
+from issmmumpssolver import issmmumpssolver
+from issmgslsolver import issmgslsolver
 
 class toolkits(object):
@@ -94,5 +96,5 @@
 
 			#now, write options
-			for optionname,optionvalue in options.iteritems():
+			for optionname,optionvalue in options:
 
 				if not optionvalue: