more changes to fix ch2 example server