Stashed config changes from OSX.