Updates for *nix deployment