Make demos more user-friendly.