Restored previous edis for unix compat, have to test them under win32