Another round of warnings fixes