some fixes for eshell