Fix getBuffers and address comments