Fix issues with SHELL variable being overriden