Better handling demo players