Strict mode compliance changes in client.