Fixes for buffer from PR #264
flakify