OSX public build fixes

A couple of fixes necessary for getting the public build off the ground on OS X.