More debugging instrumentation