modifications to enable MiniAOD, fix for HI