nix, random fixes