Fix buffer keywords