fix buffer guard generation#2

R-unic merged 2 commits intoR-unic:masterR-unic/tether:masterfrom

koxx12-dev:masterkoxx12-dev/tether:masterCopy head branch name to clipboard