Compile fixes for OSX moved