More report tweaks