Minor fixes and UX enhancements.