Kali: Misc fixes

Still hasn't fully been tested