Some minor customizations