Post-action cleanup, fix the NEI crash