Added some static analysis