more vulnerability fixes, think i got most of them