Fix ProgressBar issues