add fixes of diverse