Patches to handle missing/invalid supplemental data