Fix per-thread buffer-local variables