fixes and client sample