Tidy up hopefully fixed encoding and mac2String