Fixing flake errors