Tracepoint fixes (2.6.32) (non-compiling)