Fixes in shell config and startup on Mac and Win