Fix canonical Client activity object