Make progress messages more relevant. Issue: #619