Fixed a few issues for strict mode.