Static Analysis fixes.