More client map stuff.