Changes for running a shell in xiki/emacs only.