More report fixes