Review follow up on branch changes. https://github.com/huika/UMA/pull/5