Taking care of some Code Analysis issues.