Re-added Mac compile fixes.  Again.