[mr2948] Fix some warnings.