taint mode fixes