YH-297: Fixed flake errors