Fix build to compile on Mac.  Finally