Fix a few more compiler warnings

No match.