Please review: some matching rule and schema related bugs