Further macosx compatibility