Slightly improved reporting