Convert match.h to unicode + other fix ups