Temp removed NEI support, and fixed incorrect calls to MC code