Fix NEI src issues and properly register NEI Handler in accordance with NEI's API