fix registry issues safely