More fixes to avoid the "finished successfully" message appearing when player stopped