consistency, match fixes