More hacks to get server adds and updates working