Fixes on UKCase