Small tweaks for user-friendliness.