escape analysis fix
sv idx map fix