fixes #6445 - Addressing (most of the) build warnings.