Set a few more local to buffer

Closes #5