fixed trace macros, used wrong define