Cleaned Buffer Fix 02

Some fixes.