Minor changes to improve experience.