Non-working instrumentation (reports all zeros)
Fix missing type parameters