Kali: Yet more misc fixes