Fix some issues with the progress indicator