Fix up for OS X. Doubtless broken something else.