Fixing claim_wait_timeout being ignored in consume and a couple of typos.