Fixing various issues with cshell setup script