[12637] Fix a few more warnings