Support for MatchOnly, various fixes