Fixes to correctly instrument all the files we want to look at