Flake fixes