Fixes for taint

Change-Id: I3780df99487d5d8e547a4ffdf0ed10f25645cc20