Fixed a couple bugs with matcher