Reportd fixes