Buf Fixes and Clear nStore DATA