Fixes for BuddyClient/Impl in ServiceClient