More *NIX improvements.