[!] Some minor fixes