[Shim] Better logging