[WIP] fixing flake errors