Warnings cleanups, no functional changes
Warnings cleanups, no functional changes