Some fixes for taint/untrust