Updates to deal with multiple NMIs now supported