Fixed a few NFA things