Fix issues + summary