Warnings corrections