Removed macosx problems