Kali: More misc bug fixes