Some minor customizations.