a few more fixes

Hi @ekfriis,

The last pull request was missing a few changes I made to get zh working with the latest fsa package. Merging these should have Shalhout all set up to run the analysis on the ntuples.

Thanks,
Stephane