Bits and bobs to help more packs pass validation.