Tying more loose ends for DVI report generation...