Fixed update issues in client