fix the shell application to work with the new timeouts