There are a lot of safe, efficacious products that combat fleas. I like diatomaceous earth (not pool-grade) and pyrethins (derived from the flower heads of several types of Old World chrysanthemums) in various delivery systems, such as powders or shampoos. Another product, d-Limonene, is a by-product of the citrus industry and carries a mild, grapefruitlike odor.
Many dogs and cats seem to benefit in the fight against fleas from the addition of garlic and brewer's yeast to their diets. When these substances are metabolized, an odor (and flavor) that fleas find very unattractive develops in the skin.