Cleaned Buffer Fix 01

Some fixes.