Fixed max buffers and removed extraneous error messages