Addressing code warnings.