Patch Macintosh and Windows support