flake fixes