I had a water in the oil problem, got carried away with the garden hose, running it on the trailer, so I drained the oil, but next time I ran it, I had more water. Turned out my oil pan wasn"t draining to the bottom using the drain plug, and a puddle of water stayed in the pan. So I used a pump and sucked it out through the dipstick tube, and got all the water out, no more problem.