Fix session reuse problems and bootstrap parser