some match fixes