UKCases classes and other bug fixes