Small fixes to have a prettier report