Handle a few more obscure fields in parsing