Some (mostly minor) modifications made for the latest 8TeV analysis.

Details as in commit messages.