Updated compilation for Mac