Kali: Misc improvements with waiting