omnivore and other fixes