Some installation and eshell fixes