Fix parts of dead code remover