Fixes for compiling on mac, distclean