Fixes for 7TeV PAT tuples

FIXES for 7TEV!!!! The changes seem to be relatively small. Let's see if this works.

I kept clicking the wrong icon.... I'm slow. :)