several fixes for miniAOD