[c2511] Fix a few more warnings. (z2476)