Warnings fixes, no functional changes