More reporting reliability tweaks