Revised compiling errors in OSX.