FIX: Small bugs with progress indicator