Fixed various issues with matches.