Fix problems in Unix