Fix autosubmit bugs