Cleanup of build warnings.