Merge "Fix mod ui build issues"