Some more reports fixes