Update type matcher and some other things