Changed to new macros in can.c