Warnings cleanups, no functional changes