R changes for win/linux