Fixed some post merge stuff
Fixed some CANJaguar deprecation issues