Autosubmit & minor fixes