Warnings fixes