fixes for 30 issues 2: Resurrection