Fix things to compile on Mac