Static Analysis fixes