Some small changes in Buffer and Client Container