Make demos a bit more user friendly.