Fix issues with return time and final submit