cpp_v2 - various fixes, making TutorialClient work