Matcha Models errors fixed