Minor settings tuning for demo using a public wifi :(