Kali: Even more misc fixes