Fixed flake issues