Progress bar bug fixes
Merged