Merge and fix warnings on UNIX.