Taint fixes