more report fixes