Some minor tweaks for a slightly improved experience.