Fixed NEI issues, without everything else.