Partial OS X build fix