Fixed unix specific problems