More format adjustments to avoid warnings.