Tweaked HWM on client.