Fix bufs