Minor changes due to Macintosh plattform