Addressing build warnings