Addressing more compiler warnings