Fixes for zombie reports