some changes after switching mac to nix branch