Addressing code analysis warnings