Minor customizations