Petites modifs anti warnings. ;)