More ClientHandle fixes.