Change some dynamic allocations back to static buffers to fix build.