Buddy Chat Sample + some SDK fixes