Fix macro errors in tlv