Some bulletproofing