Fix flake issues