fixed a few compiler warnings about matches