Flake style fixes