Early modifications for compiling in mac