Some further updates for strict mode.