Open source fixes: builds on OS X again.