Fixed Code Analysis problems, among other complaints