add some fixes for compiling on mac os x