Mark some fields as omitempty, and increase chan buffer size