Backporting ntuple fixes to summer2013 branch

@mverzett, does this look okay to you?