Code Analysis fixes.