Adjusting for server changes