Code clean-up to get rid of build warnings.