ofsoftswitch13: 36738ae Fix a few more warnings.