fix some flake issues