Updating FatClient to work with C*1.2