Fix streak and progress bug