Adding fixes to the progress calculation