Two shell bug fixes - escaping error and extra "EOF".