Some type matcher updates