Fix compile issues in Mac OSX 10.9.4 (Mavericks)