Update to latest client changes