Bug fixes of all flavors