Updated client->static related code.