Bug fixes and one small UX improvement