Two nasty stragglers fixed.