Fixes for taint tracking