Hi Adam some fixes & updates to prepare for libnfc-1.7.0