Fixing final *nix issues