Warnings improvements