Lazy-initialize the buffer handler, fixes #359
CS fixes