A few added checks against bunk data