More poison fixes.