some buf address corrections