uksl: fixing some patch issues