A few more minor customization tweaks