Fix a bug in Unary::match introduced recently.
Fix a few warnings