Fix old warnings states