fix non-server examples
fix up examples from pervious changes