Fixed unix-tools