Resolve flake problems