fixes in the wild