Fixing up analysis and client examples