Minor bug fixes; UI trimming enhancements.