Queuing some fixes.

Includes the NAE fix.  Can keep this pull request open for awhile, as I may just go ahead and take care of some other, less trivial bugs reported.