More updates in the C_CAN support, but locking not reworked still.