Fix post cleanup traces