Minor cleanup - inspector and client
Add keys to fix staleness bug