Bug fixes for _NO_EXTENSIONS mode.

2 files changed