Some changes in MacOS and shell