Fix some OSX warnings + rename template matcher.