Another batch of report fixes